gtkx: Add support for g_autoptr()

https://bugzilla.gnome.org/show_bug.cgi?id=743640

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 14a43d0ef4b8bf72dc9e6cf9748a2ff76e91b46d..ed874754d34198873027bb594f4812dc33e49905 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -109,6 +109,7 @@ gtk_public_h_sources =              \
        gtk.h                   \
        gtk-autocleanups.h      \
        gtkx.h                  \
+       gtkx-autocleanups.h     \
        gtk-a11y.h              \
        gtkaboutdialog.h        \
        gtkaccelgroup.h         \

diff --git a/gtk/gtkx-autocleanups.h b/gtk/gtkx-autocleanups.h
new file mode 100644 (file)
index 0000000..3705ff4
--- /dev/null
+++ b/gtk/gtkx-autocleanups.h
@@ -0,0 +1,27 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined (__GTKX_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtkx.h> can be included directly."
+#endif
+
+#ifndef __GI_SCANNER__
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSocket, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPlug, g_object_unref)
+
+#endif

diff --git a/gtk/gtkx.h b/gtk/gtkx.h
index e5d25318238f50fd4fb24d49798dc143be4346b5..f7bce4fef69f83e8de9e841ec03fd389d6e78830 100644 (file)
--- a/gtk/gtkx.h
+++ b/gtk/gtkx.h
@@ -29,6 +29,8 @@
 #include <gtk/gtksocket.h>
 #include <gtk/gtkplug.h>
 
+#include <gtk/gtkx-autocleanups.h>
+
 #undef __GTKX_H_INSIDE__
 
 #endif /* __GTK_X_H__ */